Bring in rest of makefile & integration voodoo for USB.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 9a524f6a838246425e322ed234301695f957f50a..26e9182b9330391379455127220656b8289b95e4 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -16,7 +16,7 @@ INHIBIT_USB=-DNO_USB
 OPTIMIZATION=-O $(EXTRA_OPTIMIZATION)
 DEBUGGING=-g $(EXTRA_DEBUGGING)
 # add -DDEBUG_MEM to turn on memory allocation logging
-CFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -Icoldsync $(INHIBIT_EXPAT) $(OPTIMIZATION)
+CFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -Icoldsync $(INHIBIT_EXPAT) $(INHIBIT_USB) $(OPTIMIZATION)
 INSTALL_TARGETDIR=/usr/local/
 
 FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
@@ -29,10 +29,12 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
 
 FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o
 
+OSJEEPS=jeeps/gpslibusb.o
 JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
        jeeps/gpsmath.o jeeps/gpsmem.o  \
        jeeps/gpsprot.o jeeps/gpsread.o \
-       jeeps/gpsrqst.o jeeps/gpssend.o jeeps/gpsserial.o jeeps/gpsutil.o
+       jeeps/gpsrqst.o jeeps/gpssend.o jeeps/gpsserial.o jeeps/gpsutil.o \
+       jeeps/gpsusbread.o jeeps/gpsusbsend.o jeeps/gpsusbstub.o $(OSJEEPS)
 # Extra modules in Jeeps that we don't use
 #      jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
 

diff --git a/gpsbabel/jeeps/garminusb.h b/gpsbabel/jeeps/garminusb.h
index eb448b67fee995600a7ed1575fef3ee3c4bcd653..edc7b800d11c3e14e0aa550da168f88d9975ecb5 100644 (file)
--- a/gpsbabel/jeeps/garminusb.h
+++ b/gpsbabel/jeeps/garminusb.h
@@ -55,4 +55,4 @@ struct {
 int gusb_cmd_send(const garmin_usb_packet *obuf, size_t sz);
 int gusb_cmd_get(garmin_usb_packet *ibuf, size_t sz);
 int gusb_open(const char *portname);
-int gusb_close(void);
+int gusb_close(const char *portname);

diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index ea283ffcdb755e15b8cf607b4b5a0a2da061a851..d504384151cb48f3fbce070bd25b35c1593bb29e 100644 (file)
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -1,3 +1,4 @@
+#if !defined(NO_USB)
 /*
     Physical/OS USB layer to talk to libusb.
 
@@ -234,3 +235,4 @@ Xmain()
                garmin_usb_scan();
 }
 #endif
+#endif /* !defined(NO_USB) */

diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c
index 26e21c980e07d7cc13e4477d616d0658f2f9eda6..e99557b6a7fb1bcd8c547863c2c490940769b611 100644 (file)
--- a/gpsbabel/jeeps/gpsusbwin.c
+++ b/gpsbabel/jeeps/gpsusbwin.c
@@ -1,3 +1,4 @@
+#if !defined(NO_USB)
 /*
     Windows layer of Garmin/USB protocol.
 
@@ -292,3 +293,4 @@ char ocmd2[] = {0x14, 00, 00, 00, 0xfe, 00, 00, 00, 00, 00, 00, 00};
        usb_intr_get();
 }
 #endif
+#endif /* !defined(NO_USB) */